bitkeeper revision 1.1159.1.510 (41d2cc76oov-FQV58eycexLwIuSxMQ)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 29 Dec 2004 15:25:42 +0000 (15:25 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 29 Dec 2004 15:25:42 +0000 (15:25 +0000)
commit24ffba07d6ffd56939814198a6b570c55295e23c
treed8294613e9a342289217ac847422ab7202c4f767
parentf59d80eb15c6fece1c5a063e67230f237e15a6c0
bitkeeper revision 1.1159.1.510 (41d2cc76oov-FQV58eycexLwIuSxMQ)

manual merge
xen/arch/x86/setup.c
xen/common/domain.c